Terminate individual tests after 30 minutes

This is an attempt to debug what happened on the ppc64el buildd.

diff --git a/debian/changelog b/debian/changelog
index bf6a1c6d0a19da8e993a85efd014b998921b1737..b2d22d554c9257fcac987e040849a38533c34840 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ostree (2016.9-2) unstable; urgency=medium
+
+  * debian/patches/Terminate-individual-tests-after-half-an-hour.patch:
+    terminate individual tests after 30 minutes, in an attempt to debug
+    what happened on the ppc64el buildd
+
+ -- Simon McVittie <smcv@debian.org>  Fri, 09 Sep 2016 08:23:44 +0100
+
 ostree (2016.9-1) unstable; urgency=medium
 
   * New upstream version

diff --git a/debian/patches/Terminate-individual-tests-after-half-an-hour.patch b/debian/patches/Terminate-individual-tests-after-half-an-hour.patch
new file mode 100644 (file)
index 0000000..3b279bb
--- /dev/null
+++ b/debian/patches/Terminate-individual-tests-after-half-an-hour.patch
@@ -0,0 +1,25 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Fri, 9 Sep 2016 08:23:36 +0100
+Subject: Terminate individual tests after half an hour
+
+While using the Automake parallel test harness, if a test hangs for
+long enough for an external watchdog to kill the entire build process
+(as happens in Debian sbuild after 150 minutes with no activity on
+stdout/stderr), the logs will not be shown. If we make an individual
+test time out sooner, logs are more likely to be shown.
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+---
+ buildutil/tap-test | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/buildutil/tap-test b/buildutil/tap-test
+index 6b2eb5c..4971f0b 100755
+--- a/buildutil/tap-test
++++ b/buildutil/tap-test
+@@ -20,4 +20,4 @@ function cleanup () {
+ }
+ trap cleanup EXIT
+ cd ${tempdir}
+-${srcd}/${bn} -k --tap
++timeout --kill-after=60 1800 ${srcd}/${bn} -k --tap

diff --git a/debian/patches/series b/debian/patches/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..f9022895173ba3b6b5a48fbe219ea3e320b35e50 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Terminate-individual-tests-after-half-an-hour.patch